Structure change

Slight structure change. Removed a few unneeded files and moved old
files into a separate folder