moved everything into a src/ directory
small bug fixes pointed out by Eclipse