Reorganize && cleanup