[master] refactor classes into multiple files