Changed directory structure of project. Also began moving toward creating a library.