Changed directory structure and add gulp+bower