Moved sources around to prepare library for packaging