move sources to correct conventions

resolves #1