Refactor directory to comply to Standard Directory Layout