Better file structure, test improvements