restructuring (now using eclipse for development)