20140411-0545-DWDT Refactored folder structure