Reorganized and added bower