Keep files separate

changes the functions to a different file organization
this way must stays more organized and modular