added more structure to code and bower