every aspect has its own source file now