Update modularization and awesomeness