Changed src structure