FIX: Moved src files out