moved master's src files to re-structured branch