FW-279 refactoring eclipse project to support new folder structure