Removed unneeded files and slightly restructured