Added Proper Directory Structure