Changed project structure to accomodate tests.