More Bugfixes

Fixed relative path issue. Changed around some more files. Mostly
bugfixes.
File Removal

^