project refactoring - Version 1.1