simplifying src structure