[CHORE] Cleaned up file structure;