refactor files, formatting layout