Cleaned up some architecture. Source cannot function now unless built in the order defined in gruntfile