Moved to src and removed underlines for tests and tools