Refactoring of CurrentPlan.java
Added files of refactoring
Translated to english ReturnUserStrings.java

Folder name changes

Deleted files with old filenames