Improved file organization.
Moved libraries.