Moved to correct (non neon5 build) directories