Moved files to be compatible with Composer