Moved to src directory, and changed base library