Refactoring, platforms layout