fixed issues by restructuring files