Moved files and added new module