Rearrangement of source code to usage with eclipse