Modified for awr project
Organized files