Cleaned up definitions and started to integrate webdev boxes