Restructed the files. Current has compiler errors. Will fix in a bit.