restructuring
update gitignore
updates source paths