Move classes to appropriate package
Add color on bottle form
Update dumps
Update css