made a clean segmentation of files for ease of readability and maintenance