Started test project. Refactoring and cleanup. More consideration for GL version.