Moved src to the base folder, put the defective libs into a separate
folder