Changing from class to module on some files