lots of refactoring and renaming, added atmos plugin