Updated to proper file structure conventions