better file and module organization
organize the code and files