Seperated the project in multiple files adding modularity