Minor Sweeper project updates, cleans up the hierarchy and makes things more obvious/easy to navigate.