commit
changed structure a bit for easier deployment on Apache