Removed lib and moved all code into the main project