Moved some stuff around, added Libraries

Added json library, hsqldb library.