added libraries, started on new file/folder structure