Removed unneeded thing
Moved into subfolder. This should make life easier.