Fix classpath dependencies
Organize interval declarations