splitted classes and moved them to the lib folder