Reorganize to dev via Eclipse