initial import
some reorganization of files and directories