file hierarchy restructured, achievement bugfix