Refectored Code added
Improved Directory Structure