separated hardshell files out & updated todo