minor changes and project restructure