Reorganized file structure, and added gradle