refactored source code directory and other changes