project restructure, minor changes