Reorganized file structure and integrated gulp