Started to modularize the library

Things are starting to get more organized