Refactor files organization