Revert "added refactored verson"

This reverts commit f6e9d2ee4a50e2f665f42c3d7008d5296afccbe0.
rearranged projects