Moved src folder into main folder
Renamed test/lib to test/src