Moved folders, fixes build