Merged stuff

New structure: all code files in src/ because Eclipse likes it that way
appearantly