Split Design.java to 3 files