Changed structure, added files i've worked on to transfer to new env