Removed a bunch of files. Re-structuring...