Updated libraries
Clean up structure. Delete unused files.