renamed file structure for better organization and updated requirements