Code structuring is being done in another Java package. Merging will be done tonight.