updated files for new file structure; added to git ignore; more updates