Organized files between development and master