restructuring project for testing