Updated file structure and added rake tasks