folder organization and require file paths now correect