Rework file structure and fixed bower