Swtiched to GulpJS and restructured src/dist files.