Moved almost everything to proper path