dir restructure, add composer support