Refactored the basic structure (added directories).