Added bower, cleaned up structure