Moved files to comply with composer