Better structure. Next step should be maven.