added bottle to project
renamed files to more descriptive names