ordered directory structure
added battery rules system