Created better file layout