Moved files to appropriate locations and changed names to more clear ones