Naming and test cases
project restructure